small refactorings, removed redudant package