Adds new generated classes with correct annotations and auto rearranged code.