Add hitbox and change package hierarchy