LD-109 Refactoring directory structure