Revert "Refactored the visibillity of some classes"

This reverts commit 4e6865ec5f7d471d8a3ee0277eefb7af219c9f88.