Split source
Add utilities to write extractors
Port comments