refactor standalone distribution assembly