Removed support package

deleted support package and place classes into more appropriate packages