first commit
migrated all code to use maps
removed old files
Merge remote-tracking branch 'origin/master'