Change directory structure
Remove underscores from 'dist' folders