Updated outputs lists and directory structure