Changing project structure. Try 2