Fixing project structure 2