updated project layout to the latest changes