Clean-Up, reorganized folder structure, adjusted SettingsController