Code Re-architecture as per Subsystems.