addon.d support, misc additions, reorganization