Removed unnecessary classes and added ArrayStructures