Controlling exposed API by re-arranging package structure. In/Out now conforms to each other