[Preprocessor] New structure

Refactoring.