Reorganized packages
Removed dead code