Rework project structure, remove trash files.