Some refactoring
Added carmods merger