Move into more sensible folder structure.