major clean up and started to introduce the new system structure.