Started the migration of the code so a package can be built.