Refactored Settings factory

Moved various factory settings elements into the setting class project