Moved contents of aoa.h to adk.h

Too many files to bother otherwise.
Deleted aoa.h