Merge "Add dirtectories and OWNER files"