Revert "API optimization"

This reverts commit dd7ae1d5023eefc8a384f7670a4c500966dda09b.

Conflicts:
	index.html
	lib/util/Util.js
solve affix bug