Restructure to package