Moved Generator, AspectMatcher and EDataTypes to plain Java