Merge upstream branch
Moved distributed files from /bootstrap to /dist folder