Refacoring of the directory structure