Arranged new classes in better package structure.