Moved some classes
Merge remote-tracking branch 'origin/CallebergBranch' into cbmerge