Re-organizing CharacterTool