Cleaned up project structure.