I think the files are all in the right places now