Few reorgnizing

Few reorgnizing