Namespace legacy classes
Merge branch 'KorvinSzanto-fix_loader'
conflict