refactor ExtractorStructs.h for faster compiles. achieves approx. 10 secs