New version in, all files in right places