Add aliases for directories and refactor