Refactoring and adding docs
Merge branch 'master' of https://github.com/LinaNouh/INSE6130Project