Moved the combined edge into a separate file
Some more refactoring. Now edge is in a separate file.