Move file into proper directory
Add map-keys