james | small renames and added 03_flattening