cleaned up project structure