Refactor and packaing outline work