Modularization test drive

Also watch trace on JavaScript console.