Consolidate a bit and make it installable