updating doa architecture and renaming object in class