Moved all existing classes, added JUnit test for speed checking