Revert "Restructured, added convenience classes"

This reverts commit 6cb9b16d3fb4cfe90154a92c9044febe884b8535.