Revert "Litt mer omtrukturering"

This reverts commit 8a85cafcf165abe635e1486243f710cca4dd9750.