Revert "Reorganized package names"

This reverts commit c3a2841ea1a9c7ef65e6caf8a284c50d2783ee56.
reordered packages names