Cleans up some of the define plugin
Adds a loader module
Some fixes to Loader