bug fixes
renaming the old modules, do not delete them for convenience for the
moment