Reorganize the maps to make the file structure a little more clean.