adding autoloading and remove require common package