Removed Submodule, added as local files with modification