Adding an hoverbike entity / restructuring