moved packages; small refactoring