moved some structures, first contents test