Code ReOrganization and Re-Architecture changes