Refactoring the directory structure for Regular character states.