new dist system

fixes #19
fixes #20