Updated campus_windows - organized subsystem