Cleaned up project structure