Rearrange folder structure to match other projects