added two more GST components and refactored package hierarchy