fixing build and project structure