Fix bug in tokenizer to also recognizer prefixed macros
Reorganize sources