Pilot code -organization module
Pilot code - remove deprecated