Revert "Beginning to restructure"

This reverts commit 550f5768c36f56e20ad549e736ec15edf2553f61.
Make exit handling better