Refactoring projects layouts...again