reorganize files to hopefully be more sane

This cleans up some extraneous indirection.