moved non-root classes into aux dir