Refactor directory and class names