1385 Move some files to sandbox