Start of restructuring into real compiler