clean up
update classLoader; needs further update to utilize the namespaces properly