Added separate client-module and index.js