Fix up after changing to scala 2.11
Refactoring, moving all files to the same package