Revert "Move class to main package"

This reverts commit 57765e764d3a342f91a7856b4cd690ed284f27e8.