Did a first pass of refactoring, preparing for merge with boon

preparing for merge with boon, widdlign down dependencies on
EasyJava/Facile Fork
preparing for merge with boon, widdling down dependencies on EasyJava/Facile Fork