Change project structure
Change project structure #2