Moved code to icybee/module-modules