Refactor

Test af refactor af nogle få klasser.
Revert "Refactor"

This reverts commit 5fbd902ccd42b03f9c14a18e8bac4d59bb0876c3.