Revert "Moving things out of public"

This reverts commit 5a08d2612a68e0b67043ac3c6b8a88595d42e9ef.
Deploying harp