change namespace and code cleanup
change autoloading