Updated, notably extracted common components out into marrow.package.