Start the porting by chnage the file structure