Refactor because VMware wants a modularized demo application.