Adjust Struture

Cannot build yet