Reorganising the directory setup