Changed structure and moved js module target