cleaned up map files, moved overrides, and edited gitignore