Made some package refactorings