Revert "Revert "Reorganizing/updating""

This reverts commit d9c5a16e7160a2ed5f5776e3849a9e34e9aec958.