Code reorganize; add a new composer dist handler (file) and bugfix to possible core make bug carried over into hacks