cleaning up project structure