Add a few extra details and move some files.