some changes to the project structure and working on simple test layout