Move User/Ship into models package