Refactor - split editing modules into classes