Cleaned up the project, bumped versions