Clean up.
Moved Stronghold into its own file.