re-organized, renamed stuff. Now using closure compiler