cleanup of addon structure
z