Code more efficient;
Updated conflation, added few methods to other classes
Updated servlet; Shifted to new package