Change to fix coding standards and conform with new file naming convention. Finished porting the rest of OAI to 7. Some code cleanup and removal of cruft.