Move classes into package