restructure files
move map building into class
all functionality into classes