Moved some files to get rid of that useless package.