Move classes to person package