fixed motion controller namespace and moved some variables one level up