Update: More changes for Gotham compatibility

Includes some additional file cleanup and re-organizing includes.