Revert "Reorganized"

This reverts commit a12ffcd3cb49b1db3bbc13d45eab6eefb33eae45.
*CROSSES FINGERS*