Moved things around, fixed stray classes
Merge branch 'master' of https://github.com/pure1/KillStreak