Added modularity and initial map reading
rmed swap