Remove old modules, align marketplace package and update readme