Rename files, prepping to move over other branch.
Manually merge in maps frontend from other branch. WIP.