Moved saved objects to General (again) and initialization to Bootstrap since it makes more sense