Fixes https://bugzilla.gnome.org/show_bug.cgi?id=794483
Making it cleaner and simpler to navigate and removing previous ugly and now useless hack where we were renaming files ourself to make meson happy.