More compiler module refactoring... still broken