First phase of directory restructure and detailed asset definitions