Refactor combiner to its own file
Update version