Fixed eclipse crap
A whole refactor went on