Created Map.h and moved some stuff there.