Updated some copyright and paths etc.