Edited filenames and merged class diagrams into master diagram