Starting to restructure the package