Revert "move classes"

This reverts commit 37759005307bf0303f6f3858c3474f143f1ed701.