Cleaned up project structure and dependencies.