Restructure as package