Delete test items, reorganize dir tree