Remove defunct keys
Rename source directory