Changed project structure
Changes to match new project structure