Removing redundant dir and adding key config