Updated Directory Structure