Ericof reorganize packge

Clean up package, add tests and move upgrade steps to a separate package