Fixed git merge issues, finalised tests, moved file directories around