Moving support files in more approriate directories