Added new project structure