Moved some files/directories around again, updated paths.