Remove submodule fork
Change class name and remove submodule