Removed old code to just use UMD
removed unused folders
resolved conflicts regarding old code