Revert "cleaning up the codebase"

This reverts commit 6774a71bffe8050d15de9e9d545ccd205963aa05.