Renaming files/clases to AD*; fixing some bugs