Refactoring code base to UMD (in progress)