Added custom tools; renamed private packages
Revert "Added custom tools; renamed private packages"

This reverts commit 9876cb5959ceb23bb234c1a3392270286b60d1d7.
Revert "Revert "Added custom tools; renamed private packages""

This reverts commit 47089bbaee4e01dc2d1b9bf8e5a06193648da7b9.