Moved map into map.h from flist