more refactors: remove mocks, move packages, remove unused classes, tests that do not make sense