cleanup of project layout