Relaunch

major refactoring and client cleanup
@dknochen Why does moment appears here? Was it inline previously or something?