Moved classes to packages, added missing test for getRepetitions