Upgrade to java 1.7
Further refactored data enums into a sub-package and removed that nasty vector-inside-an-enum thing
Fixed warning so eclipse stops bugging me