More updates for new project layout