Start refactoring by separating packages