Refactored layout of directories