Replace old code by new code from development branch.

I have decided to replace old code by new code from development branch. It reflect the changing in the structure of project