Merge: separate_compiler: Refactored class compilation