Changed modulo to new packagestructure + Concrete syntax generation