Refactored moving stuff into packages