CHANGE: renaming and removing deprecated modulese