Renaming layout files so we have a better structure on that folder
Fixing references
Merge pull request #283 from arthurbenemann/RenamingLayouts

Renaming layouts