Moving the factory class to root