Added PEGKit and converted to workspace