Moved some files to correct location.