Rearrange folder structure

This makes the folder structure more shallow, which should hopefully
make it easier to deal with.