Cleaning up code and folder a bit