Working on new simplified directory structure.