Finishing up most of the modules

    Still need more work on route utils

Conflicts:
	test/test-module.js