Move classes into actual package