Fixed project structure...