New directory structure applied