Source refactor: split pplexer from preprocessor and move things around