Cleaned up code and project structure