spring cleaning

Cleaned up the Git to match the server