Code cleanup: changing all public classes to internal
Code cleanup: removed unused imports
Code cleanup: removed unused references