Moving modules to a folder to ease automation