Restructure 1

simple class system, Map Functions in own class
Collider not split off.