Cleaned up Solution, moved things into solution folders
Cleaned up some references
Merge branch 'master' of https://github.com/Redth/Rivets