clean up, moved the settings into standard location