Move a bunch of stuff around.
added structure map