For the sake of readability and consistency.
Moved some mapflags to their appropriate files.
No functional changes.