Added Dianas data structures for new files. Refactored method names.