Moved around files to better naming scheme for ordered-dict