Converted to UMD structure
Merge branch 'umd'