refactor(*): moved things into packages