Move USER class to use autoloading