Moving everything into packages