Genreral: Renaming lot's of layout files,

to improve the structure of the folder
General: Fixing reference errors