Extracted the Members module
Extracted the I18n module
Tidying
Removed deprecated code