Added files for revamp using THC's grammar