Update copyrights and tidy project layout