Renamed packages to match JavaGimmicks structures
Ajusted var names