Further reorganization and updates to settings and structure