Clanup package hierarchy in Character_Main/test
Merge remote-tracking branch 'origin/Anathema3' into Anathema3