Cleanup the layout of project.
Update for new version.