These files are hard-coded twice! I can change that if we think this is an issue... @rmcgibbo what is your preference?