Removed a dead class
Updated copyright and orgainized imports
renamed importer and loader packages