Updated Project Structure