Revert "Reorganized Folders ..."

This reverts commit 5f7f1d3637c797ea2a57b4d8cb8bbaf8e92107e9.