Move packages/classes around

No doc yet... And no tests yet either :/