divided into two packages, removed unused mothods and classes
removed unused code