Restructured into package