Adding zipping of distributables. Minor refactoring