upgraded to codekit 2, added source maps, cleanup, renaming, upgraded to normalize 3