Added temporary test codes
started to changed structure
Fixed test problem. Continued to change system structure.