Removing a couple of TODOs.
Properties get their own package.
CLI gets its own package.
Reduce unnecessary visibility.