Sorted classes into different packages. And removed unused class and
package.