Fix adapter initialization when Plone site is not setup
Adapt to the new tool storage
sort imports