diff --git a/providers/icon_lullacons/icons/alert.png b/providers/lullacons/icons/alert.png
similarity index 100%
rename from providers/icon_lullacons/icons/alert.png
rename to providers/lullacons/icons/alert.png
diff --git a/providers/icon_lullacons/icons/arrow-double-down-green.png b/providers/lullacons/icons/arrow-double-down-green.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-double-down-green.png
rename to providers/lullacons/icons/arrow-double-down-green.png
diff --git a/providers/icon_lullacons/icons/arrow-double-down-red.png b/providers/lullacons/icons/arrow-double-down-red.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-double-down-red.png
rename to providers/lullacons/icons/arrow-double-down-red.png
diff --git a/providers/icon_lullacons/icons/arrow-double-left-green.png b/providers/lullacons/icons/arrow-double-left-green.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-double-left-green.png
rename to providers/lullacons/icons/arrow-double-left-green.png
diff --git a/providers/icon_lullacons/icons/arrow-double-left-red.png b/providers/lullacons/icons/arrow-double-left-red.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-double-left-red.png
rename to providers/lullacons/icons/arrow-double-left-red.png
diff --git a/providers/icon_lullacons/icons/arrow-double-right-green.png b/providers/lullacons/icons/arrow-double-right-green.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-double-right-green.png
rename to providers/lullacons/icons/arrow-double-right-green.png
diff --git a/providers/icon_lullacons/icons/arrow-double-right-red.png b/providers/lullacons/icons/arrow-double-right-red.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-double-right-red.png
rename to providers/lullacons/icons/arrow-double-right-red.png
diff --git a/providers/icon_lullacons/icons/arrow-double-up-green.png b/providers/lullacons/icons/arrow-double-up-green.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-double-up-green.png
rename to providers/lullacons/icons/arrow-double-up-green.png
diff --git a/providers/icon_lullacons/icons/arrow-double-up-red.png b/providers/lullacons/icons/arrow-double-up-red.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-double-up-red.png
rename to providers/lullacons/icons/arrow-double-up-red.png
diff --git a/providers/icon_lullacons/icons/arrow-end-down-green.png b/providers/lullacons/icons/arrow-end-down-green.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-end-down-green.png
rename to providers/lullacons/icons/arrow-end-down-green.png
diff --git a/providers/icon_lullacons/icons/arrow-end-down-red.png b/providers/lullacons/icons/arrow-end-down-red.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-end-down-red.png
rename to providers/lullacons/icons/arrow-end-down-red.png
diff --git a/providers/icon_lullacons/icons/arrow-end-left-green.png b/providers/lullacons/icons/arrow-end-left-green.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-end-left-green.png
rename to providers/lullacons/icons/arrow-end-left-green.png
diff --git a/providers/icon_lullacons/icons/arrow-end-left-red.png b/providers/lullacons/icons/arrow-end-left-red.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-end-left-red.png
rename to providers/lullacons/icons/arrow-end-left-red.png
diff --git a/providers/icon_lullacons/icons/arrow-end-right-green.png b/providers/lullacons/icons/arrow-end-right-green.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-end-right-green.png
rename to providers/lullacons/icons/arrow-end-right-green.png
diff --git a/providers/icon_lullacons/icons/arrow-end-right-red.png b/providers/lullacons/icons/arrow-end-right-red.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-end-right-red.png
rename to providers/lullacons/icons/arrow-end-right-red.png
diff --git a/providers/icon_lullacons/icons/arrow-end-up-green.png b/providers/lullacons/icons/arrow-end-up-green.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-end-up-green.png
rename to providers/lullacons/icons/arrow-end-up-green.png
diff --git a/providers/icon_lullacons/icons/arrow-end-up-red.png b/providers/lullacons/icons/arrow-end-up-red.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-end-up-red.png
rename to providers/lullacons/icons/arrow-end-up-red.png
diff --git a/providers/icon_lullacons/icons/arrow-single-down-green.png b/providers/lullacons/icons/arrow-single-down-green.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-single-down-green.png
rename to providers/lullacons/icons/arrow-single-down-green.png
diff --git a/providers/icon_lullacons/icons/arrow-single-down-red.png b/providers/lullacons/icons/arrow-single-down-red.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-single-down-red.png
rename to providers/lullacons/icons/arrow-single-down-red.png
diff --git a/providers/icon_lullacons/icons/arrow-single-left-green.png b/providers/lullacons/icons/arrow-single-left-green.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-single-left-green.png
rename to providers/lullacons/icons/arrow-single-left-green.png
diff --git a/providers/icon_lullacons/icons/arrow-single-left-red.png b/providers/lullacons/icons/arrow-single-left-red.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-single-left-red.png
rename to providers/lullacons/icons/arrow-single-left-red.png
diff --git a/providers/icon_lullacons/icons/arrow-single-right-green.png b/providers/lullacons/icons/arrow-single-right-green.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-single-right-green.png
rename to providers/lullacons/icons/arrow-single-right-green.png
diff --git a/providers/icon_lullacons/icons/arrow-single-right-red.png b/providers/lullacons/icons/arrow-single-right-red.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-single-right-red.png
rename to providers/lullacons/icons/arrow-single-right-red.png
diff --git a/providers/icon_lullacons/icons/arrow-single-up-green.png b/providers/lullacons/icons/arrow-single-up-green.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-single-up-green.png
rename to providers/lullacons/icons/arrow-single-up-green.png
diff --git a/providers/icon_lullacons/icons/arrow-single-up-red.png b/providers/lullacons/icons/arrow-single-up-red.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-single-up-red.png
rename to providers/lullacons/icons/arrow-single-up-red.png
diff --git a/providers/icon_lullacons/icons/arrow-small-down-green.png b/providers/lullacons/icons/arrow-small-down-green.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-small-down-green.png
rename to providers/lullacons/icons/arrow-small-down-green.png
diff --git a/providers/icon_lullacons/icons/arrow-small-down-red.png b/providers/lullacons/icons/arrow-small-down-red.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-small-down-red.png
rename to providers/lullacons/icons/arrow-small-down-red.png
diff --git a/providers/icon_lullacons/icons/arrow-small-left-green.png b/providers/lullacons/icons/arrow-small-left-green.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-small-left-green.png
rename to providers/lullacons/icons/arrow-small-left-green.png
diff --git a/providers/icon_lullacons/icons/arrow-small-left-red.png b/providers/lullacons/icons/arrow-small-left-red.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-small-left-red.png
rename to providers/lullacons/icons/arrow-small-left-red.png
diff --git a/providers/icon_lullacons/icons/arrow-small-right-green.png b/providers/lullacons/icons/arrow-small-right-green.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-small-right-green.png
rename to providers/lullacons/icons/arrow-small-right-green.png
diff --git a/providers/icon_lullacons/icons/arrow-small-right-red.png b/providers/lullacons/icons/arrow-small-right-red.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-small-right-red.png
rename to providers/lullacons/icons/arrow-small-right-red.png
diff --git a/providers/icon_lullacons/icons/arrow-small-up-green.png b/providers/lullacons/icons/arrow-small-up-green.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-small-up-green.png
rename to providers/lullacons/icons/arrow-small-up-green.png
diff --git a/providers/icon_lullacons/icons/arrow-small-up-red.png b/providers/lullacons/icons/arrow-small-up-red.png
similarity index 100%
rename from providers/icon_lullacons/icons/arrow-small-up-red.png
rename to providers/lullacons/icons/arrow-small-up-red.png
diff --git a/providers/icon_lullacons/icons/bot-plain-blue.png b/providers/lullacons/icons/bot-plain-blue.png
similarity index 100%
rename from providers/icon_lullacons/icons/bot-plain-blue.png
rename to providers/lullacons/icons/bot-plain-blue.png
diff --git a/providers/icon_lullacons/icons/bot-plain-green.png b/providers/lullacons/icons/bot-plain-green.png
similarity index 100%
rename from providers/icon_lullacons/icons/bot-plain-green.png
rename to providers/lullacons/icons/bot-plain-green.png
diff --git a/providers/icon_lullacons/icons/bot-plain-red.png b/providers/lullacons/icons/bot-plain-red.png
similarity index 100%
rename from providers/icon_lullacons/icons/bot-plain-red.png
rename to providers/lullacons/icons/bot-plain-red.png
diff --git a/providers/icon_lullacons/icons/bot-plain-white.png b/providers/lullacons/icons/bot-plain-white.png
similarity index 100%
rename from providers/icon_lullacons/icons/bot-plain-white.png
rename to providers/lullacons/icons/bot-plain-white.png
diff --git a/providers/icon_lullacons/icons/bot-plain-yellow.png b/providers/lullacons/icons/bot-plain-yellow.png
similarity index 100%
rename from providers/icon_lullacons/icons/bot-plain-yellow.png
rename to providers/lullacons/icons/bot-plain-yellow.png
diff --git a/providers/icon_lullacons/icons/bullet-arrow-down.png b/providers/lullacons/icons/bullet-arrow-down.png
similarity index 100%
rename from providers/icon_lullacons/icons/bullet-arrow-down.png
rename to providers/lullacons/icons/bullet-arrow-down.png
diff --git a/providers/icon_lullacons/icons/bullet-arrow-right.png b/providers/lullacons/icons/bullet-arrow-right.png
similarity index 100%
rename from providers/icon_lullacons/icons/bullet-arrow-right.png
rename to providers/lullacons/icons/bullet-arrow-right.png
diff --git a/providers/icon_lullacons/icons/bullet-round.png b/providers/lullacons/icons/bullet-round.png
similarity index 100%
rename from providers/icon_lullacons/icons/bullet-round.png
rename to providers/lullacons/icons/bullet-round.png
diff --git a/providers/icon_lullacons/icons/bullet-sm-arrow-down.png b/providers/lullacons/icons/bullet-sm-arrow-down.png
similarity index 100%
rename from providers/icon_lullacons/icons/bullet-sm-arrow-down.png
rename to providers/lullacons/icons/bullet-sm-arrow-down.png
diff --git a/providers/icon_lullacons/icons/bullet-sm-arrow-right.png b/providers/lullacons/icons/bullet-sm-arrow-right.png
similarity index 100%
rename from providers/icon_lullacons/icons/bullet-sm-arrow-right.png
rename to providers/lullacons/icons/bullet-sm-arrow-right.png
diff --git a/providers/icon_lullacons/icons/bullet-square.png b/providers/lullacons/icons/bullet-square.png
similarity index 100%
rename from providers/icon_lullacons/icons/bullet-square.png
rename to providers/lullacons/icons/bullet-square.png
diff --git a/providers/icon_lullacons/icons/calendar.png b/providers/lullacons/icons/calendar.png
similarity index 100%
rename from providers/icon_lullacons/icons/calendar.png
rename to providers/lullacons/icons/calendar.png
diff --git a/providers/icon_lullacons/icons/cart.png b/providers/lullacons/icons/cart.png
similarity index 100%
rename from providers/icon_lullacons/icons/cart.png
rename to providers/lullacons/icons/cart.png
diff --git a/providers/icon_lullacons/icons/database-option-add.png b/providers/lullacons/icons/database-option-add.png
similarity index 100%
rename from providers/icon_lullacons/icons/database-option-add.png
rename to providers/lullacons/icons/database-option-add.png
diff --git a/providers/icon_lullacons/icons/database-option-remove.png b/providers/lullacons/icons/database-option-remove.png
similarity index 100%
rename from providers/icon_lullacons/icons/database-option-remove.png
rename to providers/lullacons/icons/database-option-remove.png
diff --git a/providers/icon_lullacons/icons/database.png b/providers/lullacons/icons/database.png
similarity index 100%
rename from providers/icon_lullacons/icons/database.png
rename to providers/lullacons/icons/database.png
diff --git a/providers/icon_lullacons/icons/date-option-add.png b/providers/lullacons/icons/date-option-add.png
similarity index 100%
rename from providers/icon_lullacons/icons/date-option-add.png
rename to providers/lullacons/icons/date-option-add.png
diff --git a/providers/icon_lullacons/icons/date-option-remove.png b/providers/lullacons/icons/date-option-remove.png
similarity index 100%
rename from providers/icon_lullacons/icons/date-option-remove.png
rename to providers/lullacons/icons/date-option-remove.png
diff --git a/providers/icon_lullacons/icons/date-plain.png b/providers/lullacons/icons/date-plain.png
similarity index 100%
rename from providers/icon_lullacons/icons/date-plain.png
rename to providers/lullacons/icons/date-plain.png
diff --git a/providers/icon_lullacons/icons/doc-option-add.png b/providers/lullacons/icons/doc-option-add.png
similarity index 100%
rename from providers/icon_lullacons/icons/doc-option-add.png
rename to providers/lullacons/icons/doc-option-add.png
diff --git a/providers/icon_lullacons/icons/doc-option-edit.png b/providers/lullacons/icons/doc-option-edit.png
similarity index 100%
rename from providers/icon_lullacons/icons/doc-option-edit.png
rename to providers/lullacons/icons/doc-option-edit.png
diff --git a/providers/icon_lullacons/icons/doc-option-remove.png b/providers/lullacons/icons/doc-option-remove.png
similarity index 100%
rename from providers/icon_lullacons/icons/doc-option-remove.png
rename to providers/lullacons/icons/doc-option-remove.png
diff --git a/providers/icon_lullacons/icons/doc-option-tab.png b/providers/lullacons/icons/doc-option-tab.png
similarity index 100%
rename from providers/icon_lullacons/icons/doc-option-tab.png
rename to providers/lullacons/icons/doc-option-tab.png
diff --git a/providers/icon_lullacons/icons/doc-plain-blue.png b/providers/lullacons/icons/doc-plain-blue.png
similarity index 100%
rename from providers/icon_lullacons/icons/doc-plain-blue.png
rename to providers/lullacons/icons/doc-plain-blue.png
diff --git a/providers/icon_lullacons/icons/doc-plain-green.png b/providers/lullacons/icons/doc-plain-green.png
similarity index 100%
rename from providers/icon_lullacons/icons/doc-plain-green.png
rename to providers/lullacons/icons/doc-plain-green.png
diff --git a/providers/icon_lullacons/icons/doc-plain-orange.png b/providers/lullacons/icons/doc-plain-orange.png
similarity index 100%
rename from providers/icon_lullacons/icons/doc-plain-orange.png
rename to providers/lullacons/icons/doc-plain-orange.png
diff --git a/providers/icon_lullacons/icons/doc-plain-red.png b/providers/lullacons/icons/doc-plain-red.png
similarity index 100%
rename from providers/icon_lullacons/icons/doc-plain-red.png
rename to providers/lullacons/icons/doc-plain-red.png
diff --git a/providers/icon_lullacons/icons/doc-plain-white.png b/providers/lullacons/icons/doc-plain-white.png
similarity index 100%
rename from providers/icon_lullacons/icons/doc-plain-white.png
rename to providers/lullacons/icons/doc-plain-white.png
diff --git a/providers/icon_lullacons/icons/doc-type-bmp.png b/providers/lullacons/icons/doc-type-bmp.png
similarity index 100%
rename from providers/icon_lullacons/icons/doc-type-bmp.png
rename to providers/lullacons/icons/doc-type-bmp.png
diff --git a/providers/icon_lullacons/icons/doc-type-doc.png b/providers/lullacons/icons/doc-type-doc.png
similarity index 100%
rename from providers/icon_lullacons/icons/doc-type-doc.png
rename to providers/lullacons/icons/doc-type-doc.png
diff --git a/providers/icon_lullacons/icons/doc-type-gif.png b/providers/lullacons/icons/doc-type-gif.png
similarity index 100%
rename from providers/icon_lullacons/icons/doc-type-gif.png
rename to providers/lullacons/icons/doc-type-gif.png
diff --git a/providers/icon_lullacons/icons/doc-type-jpg.png b/providers/lullacons/icons/doc-type-jpg.png
similarity index 100%
rename from providers/icon_lullacons/icons/doc-type-jpg.png
rename to providers/lullacons/icons/doc-type-jpg.png
diff --git a/providers/icon_lullacons/icons/doc-type-pict.png b/providers/lullacons/icons/doc-type-pict.png
similarity index 100%
rename from providers/icon_lullacons/icons/doc-type-pict.png
rename to providers/lullacons/icons/doc-type-pict.png
diff --git a/providers/icon_lullacons/icons/doc-type-png.png b/providers/lullacons/icons/doc-type-png.png
similarity index 100%
rename from providers/icon_lullacons/icons/doc-type-png.png
rename to providers/lullacons/icons/doc-type-png.png
diff --git a/providers/icon_lullacons/icons/doc-type-ppt.png b/providers/lullacons/icons/doc-type-ppt.png
similarity index 100%
rename from providers/icon_lullacons/icons/doc-type-ppt.png
rename to providers/lullacons/icons/doc-type-ppt.png
diff --git a/providers/icon_lullacons/icons/doc-type-xls.png b/providers/lullacons/icons/doc-type-xls.png
similarity index 100%
rename from providers/icon_lullacons/icons/doc-type-xls.png
rename to providers/lullacons/icons/doc-type-xls.png
diff --git a/providers/icon_lullacons/icons/error.png b/providers/lullacons/icons/error.png
similarity index 100%
rename from providers/icon_lullacons/icons/error.png
rename to providers/lullacons/icons/error.png
diff --git a/providers/icon_lullacons/icons/folder-closed-blue.png b/providers/lullacons/icons/folder-closed-blue.png
similarity index 100%
rename from providers/icon_lullacons/icons/folder-closed-blue.png
rename to providers/lullacons/icons/folder-closed-blue.png
diff --git a/providers/icon_lullacons/icons/folder-closed-green.png b/providers/lullacons/icons/folder-closed-green.png
similarity index 100%
rename from providers/icon_lullacons/icons/folder-closed-green.png
rename to providers/lullacons/icons/folder-closed-green.png
diff --git a/providers/icon_lullacons/icons/folder-closed-red.png b/providers/lullacons/icons/folder-closed-red.png
similarity index 100%
rename from providers/icon_lullacons/icons/folder-closed-red.png
rename to providers/lullacons/icons/folder-closed-red.png
diff --git a/providers/icon_lullacons/icons/folder-closed-white.png b/providers/lullacons/icons/folder-closed-white.png
similarity index 100%
rename from providers/icon_lullacons/icons/folder-closed-white.png
rename to providers/lullacons/icons/folder-closed-white.png
diff --git a/providers/icon_lullacons/icons/folder-open-blue.png b/providers/lullacons/icons/folder-open-blue.png
similarity index 100%
rename from providers/icon_lullacons/icons/folder-open-blue.png
rename to providers/lullacons/icons/folder-open-blue.png
diff --git a/providers/icon_lullacons/icons/folder-open-green.png b/providers/lullacons/icons/folder-open-green.png
similarity index 100%
rename from providers/icon_lullacons/icons/folder-open-green.png
rename to providers/lullacons/icons/folder-open-green.png
diff --git a/providers/icon_lullacons/icons/folder-open-red.png b/providers/lullacons/icons/folder-open-red.png
similarity index 100%
rename from providers/icon_lullacons/icons/folder-open-red.png
rename to providers/lullacons/icons/folder-open-red.png
diff --git a/providers/icon_lullacons/icons/folder-open-white.png b/providers/lullacons/icons/folder-open-white.png
similarity index 100%
rename from providers/icon_lullacons/icons/folder-open-white.png
rename to providers/lullacons/icons/folder-open-white.png
diff --git a/providers/icon_lullacons/icons/folder-option-add.png b/providers/lullacons/icons/folder-option-add.png
similarity index 100%
rename from providers/icon_lullacons/icons/folder-option-add.png
rename to providers/lullacons/icons/folder-option-add.png
diff --git a/providers/icon_lullacons/icons/folder-option-denied.png b/providers/lullacons/icons/folder-option-denied.png
similarity index 100%
rename from providers/icon_lullacons/icons/folder-option-denied.png
rename to providers/lullacons/icons/folder-option-denied.png
diff --git a/providers/icon_lullacons/icons/folder-option-insert.png b/providers/lullacons/icons/folder-option-insert.png
similarity index 100%
rename from providers/icon_lullacons/icons/folder-option-insert.png
rename to providers/lullacons/icons/folder-option-insert.png
diff --git a/providers/icon_lullacons/icons/folder-option-remove.png b/providers/lullacons/icons/folder-option-remove.png
similarity index 100%
rename from providers/icon_lullacons/icons/folder-option-remove.png
rename to providers/lullacons/icons/folder-option-remove.png
diff --git a/providers/icon_lullacons/icons/info.png b/providers/lullacons/icons/info.png
similarity index 100%
rename from providers/icon_lullacons/icons/info.png
rename to providers/lullacons/icons/info.png
diff --git a/providers/icon_lullacons/icons/large-alert.png b/providers/lullacons/icons/large-alert.png
similarity index 100%
rename from providers/icon_lullacons/icons/large-alert.png
rename to providers/lullacons/icons/large-alert.png
diff --git a/providers/icon_lullacons/icons/large-info.png b/providers/lullacons/icons/large-info.png
similarity index 100%
rename from providers/icon_lullacons/icons/large-info.png
rename to providers/lullacons/icons/large-info.png
diff --git a/providers/icon_lullacons/icons/large-stop.png b/providers/lullacons/icons/large-stop.png
similarity index 100%
rename from providers/icon_lullacons/icons/large-stop.png
rename to providers/lullacons/icons/large-stop.png
diff --git a/providers/icon_lullacons/icons/lullacons-readme.txt b/providers/lullacons/icons/lullacons-readme.txt
similarity index 100%
rename from providers/icon_lullacons/icons/lullacons-readme.txt
rename to providers/lullacons/icons/lullacons-readme.txt
diff --git a/providers/icon_lullacons/icons/mail-open.png b/providers/lullacons/icons/mail-open.png
similarity index 100%
rename from providers/icon_lullacons/icons/mail-open.png
rename to providers/lullacons/icons/mail-open.png
diff --git a/providers/icon_lullacons/icons/mail.png b/providers/lullacons/icons/mail.png
similarity index 100%
rename from providers/icon_lullacons/icons/mail.png
rename to providers/lullacons/icons/mail.png
diff --git a/providers/icon_lullacons/icons/mini-category.png b/providers/lullacons/icons/mini-category.png
similarity index 100%
rename from providers/icon_lullacons/icons/mini-category.png
rename to providers/lullacons/icons/mini-category.png
diff --git a/providers/icon_lullacons/icons/mini-comment.png b/providers/lullacons/icons/mini-comment.png
similarity index 100%
rename from providers/icon_lullacons/icons/mini-comment.png
rename to providers/lullacons/icons/mini-comment.png
diff --git a/providers/icon_lullacons/icons/mini-doc.png b/providers/lullacons/icons/mini-doc.png
similarity index 100%
rename from providers/icon_lullacons/icons/mini-doc.png
rename to providers/lullacons/icons/mini-doc.png
diff --git a/providers/icon_lullacons/icons/mini-edit.png b/providers/lullacons/icons/mini-edit.png
similarity index 100%
rename from providers/icon_lullacons/icons/mini-edit.png
rename to providers/lullacons/icons/mini-edit.png
diff --git a/providers/icon_lullacons/icons/mini-mail-open.png b/providers/lullacons/icons/mini-mail-open.png
similarity index 100%
rename from providers/icon_lullacons/icons/mini-mail-open.png
rename to providers/lullacons/icons/mini-mail-open.png
diff --git a/providers/icon_lullacons/icons/mini-mail.png b/providers/lullacons/icons/mini-mail.png
similarity index 100%
rename from providers/icon_lullacons/icons/mini-mail.png
rename to providers/lullacons/icons/mini-mail.png
diff --git a/providers/icon_lullacons/icons/mini-time.png b/providers/lullacons/icons/mini-time.png
similarity index 100%
rename from providers/icon_lullacons/icons/mini-time.png
rename to providers/lullacons/icons/mini-time.png
diff --git a/providers/icon_lullacons/icons/mini-trash.png b/providers/lullacons/icons/mini-trash.png
similarity index 100%
rename from providers/icon_lullacons/icons/mini-trash.png
rename to providers/lullacons/icons/mini-trash.png
diff --git a/providers/icon_lullacons/icons/movie-option-add.png b/providers/lullacons/icons/movie-option-add.png
similarity index 100%
rename from providers/icon_lullacons/icons/movie-option-add.png
rename to providers/lullacons/icons/movie-option-add.png
diff --git a/providers/icon_lullacons/icons/movie-option-remove.png b/providers/lullacons/icons/movie-option-remove.png
similarity index 100%
rename from providers/icon_lullacons/icons/movie-option-remove.png
rename to providers/lullacons/icons/movie-option-remove.png
diff --git a/providers/icon_lullacons/icons/movie.png b/providers/lullacons/icons/movie.png
similarity index 100%
rename from providers/icon_lullacons/icons/movie.png
rename to providers/lullacons/icons/movie.png
diff --git a/providers/icon_lullacons/icons/photo-multiple-option-add.png b/providers/lullacons/icons/photo-multiple-option-add.png
similarity index 100%
rename from providers/icon_lullacons/icons/photo-multiple-option-add.png
rename to providers/lullacons/icons/photo-multiple-option-add.png
diff --git a/providers/icon_lullacons/icons/photo-multiple-option-remov.png b/providers/lullacons/icons/photo-multiple-option-remov.png
similarity index 100%
rename from providers/icon_lullacons/icons/photo-multiple-option-remov.png
rename to providers/lullacons/icons/photo-multiple-option-remov.png
diff --git a/providers/icon_lullacons/icons/photo-multiple.png b/providers/lullacons/icons/photo-multiple.png
similarity index 100%
rename from providers/icon_lullacons/icons/photo-multiple.png
rename to providers/lullacons/icons/photo-multiple.png
diff --git a/providers/icon_lullacons/icons/photo-option-add.png b/providers/lullacons/icons/photo-option-add.png
similarity index 100%
rename from providers/icon_lullacons/icons/photo-option-add.png
rename to providers/lullacons/icons/photo-option-add.png
diff --git a/providers/icon_lullacons/icons/photo-option-remove.png b/providers/lullacons/icons/photo-option-remove.png
similarity index 100%
rename from providers/icon_lullacons/icons/photo-option-remove.png
rename to providers/lullacons/icons/photo-option-remove.png
diff --git a/providers/icon_lullacons/icons/photo.png b/providers/lullacons/icons/photo.png
similarity index 100%
rename from providers/icon_lullacons/icons/photo.png
rename to providers/lullacons/icons/photo.png
diff --git a/providers/icon_lullacons/icons/time.png b/providers/lullacons/icons/time.png
similarity index 100%
rename from providers/icon_lullacons/icons/time.png
rename to providers/lullacons/icons/time.png
diff --git a/providers/icon_lullacons/icons/user-multiple.png b/providers/lullacons/icons/user-multiple.png
similarity index 100%
rename from providers/icon_lullacons/icons/user-multiple.png
rename to providers/lullacons/icons/user-multiple.png
diff --git a/providers/icon_lullacons/icons/user-option-add.png b/providers/lullacons/icons/user-option-add.png
similarity index 100%
rename from providers/icon_lullacons/icons/user-option-add.png
rename to providers/lullacons/icons/user-option-add.png
diff --git a/providers/icon_lullacons/icons/user-option-remove.png b/providers/lullacons/icons/user-option-remove.png
similarity index 100%
rename from providers/icon_lullacons/icons/user-option-remove.png
rename to providers/lullacons/icons/user-option-remove.png
diff --git a/providers/icon_lullacons/icons/user-plain-blue.png b/providers/lullacons/icons/user-plain-blue.png
similarity index 100%
rename from providers/icon_lullacons/icons/user-plain-blue.png
rename to providers/lullacons/icons/user-plain-blue.png
diff --git a/providers/icon_lullacons/icons/user-plain-green.png b/providers/lullacons/icons/user-plain-green.png
similarity index 100%
rename from providers/icon_lullacons/icons/user-plain-green.png
rename to providers/lullacons/icons/user-plain-green.png
diff --git a/providers/icon_lullacons/icons/user-plain-red.png b/providers/lullacons/icons/user-plain-red.png
similarity index 100%
rename from providers/icon_lullacons/icons/user-plain-red.png
rename to providers/lullacons/icons/user-plain-red.png
diff --git a/providers/icon_lullacons/icons/user-plain-yellow.png b/providers/lullacons/icons/user-plain-yellow.png
similarity index 100%
rename from providers/icon_lullacons/icons/user-plain-yellow.png
rename to providers/lullacons/icons/user-plain-yellow.png
diff --git a/providers/icon_lullacons/icon_lullacons.info b/providers/lullacons/lullacons.info
similarity index 100%
rename from providers/icon_lullacons/icon_lullacons.info
rename to providers/lullacons/lullacons.info
diff --git a/providers/icon_lullacons/icon_lullacons.module b/providers/lullacons/lullacons.module
similarity index 96%
rename from providers/icon_lullacons/icon_lullacons.module
rename to providers/lullacons/lullacons.module
index fdcd587ac9b9daf905e5fb4e2239f58ecff110f2..1bed75c8902f53b38c5dedfa5f43af3ead376b0c 100644
--- a/providers/icon_lullacons/icon_lullacons.module
+++ b/providers/lullacons/lullacons.module
@@ -3,7 +3,7 @@
 /**
  * Implements hook_icon_bundle_info().
  */
-function icon_lullacons_icon_bundle_info() {
+function lullacons_icon_bundle_info() {
   $bundles = array();
   $bundles['lullacons_pack1'] = array(
     'title' => t('Lullacons: Pack 1'),
@@ -145,7 +145,7 @@ function template_preprocess_icon_lullacons(&$variables) {
 function theme_icon_lullacons($variables) {
   $output = '';
   if ($variables['bundle']['name'] === 'lullacons_pack1') {
-    $path = drupal_get_path('module', 'icon_lullacons') . '/icons/' . $variables['icon'] . '.png';
+    $path = drupal_get_path('module', 'lullacons') . '/icons/' . $variables['icon'] . '.png';
     if ($info = image_get_info($path)) {
       $output = theme('image', array(
         'path' => $path,