Refactoring and cleaning up code.
Adds files for oblig2