Rearrange folder structure to match Express