Updating to new project layout and format