For the sake of readability and consistency. Moved some mapflags to their appropriate files. No functional changes.
Fixes #3314 Thanks to @aleos89 for his help.