package refactors
license header updates