Code refactoring
Moved the layouts and views to their own folders