Cleaned up files. Renamed stuff integration tests though they still don't run. Assume it has something to do with Karyon/Governator/Spring getting messed up