Cleaned up and organized the project