I decided not to leave everything in cfcli sub-packages.