refactor standalone distribution assembly
Merge pull request #1694 from dejanb/master

this is fine. we can change what we want here since the distro will probably be changing anyway