Restructured into package form