Move Settings module

Move the settings module to the generic folder