Move stuff back into the main dir.