Organized folders
Revert "Organized folders"

This reverts commit e750c5651bb0c2a38a6401ffa15e5832b0140f02.