Updated Directory Stucture