Re-arranged group and folder structure to make it easy for plugman support.