refactored structure of the directory