Store key files in more approriate locations