Revert "Reorganized and working on a better design"

This reverts commit ff39b5ba6ee0597d8625370912d6af6a18727f85.
Let's try this again.