Cleanup

A lot of cleanup to make the project easier to manage