Move attachment stuff into new namespace