fixing project structure to comply