Revert "Revert "Added site_extras to base""

This reverts commit b160e0161e8b613f71bb8354e82298b3ec71b9f5.