Moving some files around. No longer using a common directory.