Package refactoring
RM old directory