Add key support to static map; rename files