Fixed project structure
Working copy