Move API entities into separate package