Task #707 - Reorganize Compiler