fixing project structure