Goofy file structure stuff to resolve a merge err