another stab at breaking the project up....
map with default
mostly automated cleanup
moving stuff around
lots of automated refactoring
reformat code