Restructure as a package