More subsystem code and reorganized some projects