Rename bundles from *.addon.* to *.addons.*
Move bundles to subdirectories
Minor Changes to remove warnings, some formatting