Upgrade structure

rearrange the structure of the project