More re-arranging.

Added `logan` and borrowed heavily from Sentry's setup.