Removed legacy classes, some refactoring
Merge pull request #17 from cs27x/bachman/refactor

Removed legacy classes, some refactoring