Start merging stuff from Anders
Refactor files
Add chapter

Fixes section numbering for now.
Change section to chapter
Formatting