Project Structure Updated