Separated src into packages