Split into packages & UI alteration