Updated to include directory structure