Reorginize the structure of my files