Remove unused class
Cleaning up package structure, eliminating any unnecessary code