All files reordered and removed unused
All files reorderd and removed unused