Move stuff into the main dir.