Improve the layout file organization

Improves the division between the files that compose the layout