restructuring, removed deprecated classloader package, cleanup